From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 26 Mar 2010 10:28:37 +0000 (+0000)
Subject: cpufreq: don't re-init active dbs timer in S3 or cpu online
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12469
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=c530aaacc2319ccf64f89ef98b5e190ab85c7bcf;p=xen.git

cpufreq: don't re-init active dbs timer in S3 or cpu online

Signed-off-by: Wei Gang <gang.wei@intel.com>
---

diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c
index d4d43f4a34..5728a8fbaf 100644
--- a/xen/drivers/cpufreq/cpufreq_ondemand.c
+++ b/xen/drivers/cpufreq/cpufreq_ondemand.c
@@ -196,8 +196,9 @@ static void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
 {
     dbs_info->enable = 1;
 
-    init_timer(&dbs_timer[dbs_info->cpu], do_dbs_timer, 
-        (void *)dbs_info, dbs_info->cpu);
+    if ( !dbs_timer[dbs_info->cpu].function )
+        init_timer(&dbs_timer[dbs_info->cpu], do_dbs_timer, 
+            (void *)dbs_info, dbs_info->cpu);
 
     set_timer(&dbs_timer[dbs_info->cpu], NOW()+dbs_tuners_ins.sampling_rate);